Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 8 Sep 2010 22:44:34 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 8 Sep 2010 22:44:34 +0000 (22:44 +0000)

Trivial merge